From 81baf850dcbe72bb031174ee5d8c6f074528c31a Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Thu, 1 Sep 2005 14:14:02 +0000 Subject: [PATCH] HACK for GCC 4.x --- ChangeLog | 5 +++++ babl/babl-internal.h | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a64f0ab..6fbdc51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-09-01 Øyvind Kolås + + * babl/babl-internal.h: HACK statically define BablDb *db, + for all internal translation units. + 2005-09-01 Øyvind Kolås Added a 128 item hashtable to each object list. diff --git a/babl/babl-internal.h b/babl/babl-internal.h index df05e52..cacff5e 100644 --- a/babl/babl-internal.h +++ b/babl/babl-internal.h @@ -65,6 +65,16 @@ Babl * babl_extension_quiet_log (void); void babl_core_init (void); +/* FIXME: nasty,. including the symbol even in files where it is + * not needed,. and a dummy function to use it in those cases + */ +static BablDb *db=NULL; +static void hack_hack (void) +{ + if (db==NULL) + db=NULL; +} + /**** LOGGER ****/ #include @@ -93,6 +103,8 @@ real_babl_log (const char *file, va_end (varg); fprintf (stdout, "\n"); + return; + hack_hack (); } #define babl_log(args...) \ @@ -121,15 +133,12 @@ while(0) :BABL_CLASS_TYPE_IS_VALID(((Babl*)(obj))->class_type) \ ) - extern int babl_hmpf_on_name_lookups; const char *babl_class_name (BablClassType klass); void babl_internal_init (void); void babl_internal_destroy (void); -extern BablDb *db; - #define BABL_DEFINE_EACH(type_name) \ void \ babl_##type_name##_each (BablEachFunction each_fun, \ @@ -185,7 +194,6 @@ babl_##type_name (const char *name) \ #define BABL_DEFINE_INIT(type_name) \ \ -static BablDb *db=NULL; \ \ void \ babl_##type_name##_init (void) \ -- 2.30.2